Fixed wrong definition of parameter gamma, added check on Nni to make sure we...

Fixed wrong definition of parameter gamma, added check on Nni to make sure we don't have a zero in the middle (useless for par. search), run some tests