Various fixes and improvements

I need another supporting structure for each of the parameter types and
unfortunately what I really need is a simulator that produces a TON of
this stuff and a driver.

Lays out the framework for effective instrument->DM testing
Merge pull request #1040 from lukecampbell/fixes

Fixes