Added missing paramter to ini, and made naming of variables relating to the control sample consistent  (rather than a mix if normal/control)