Allow inclusion of arbitrary parameters

I needed to allow the inclusion of parameters not explicitely specified in the formula. I also needed to refactor the way options are handled to do this.