Iron out a few kinks in handling parameters