Bugfix and updated parameter layout

Delete these, they just create clutter.