Series of bug fixes. closes #150.

A series of bug fixes. See specific commits for details. 
I don't think this is quite what we want. Right now, there is still a form somewhere on the site using the old params that might not work if we do this.