Bugfix and updated parameter layout

Might like to add some comments about why these commented parameters are here.