Changes for parameter controls

Seems to be working now, but not tested very much...