Fix semanic error, and remove unneeded parameter.
Add contained views for Instrument and Tuning.  Ensure valid usage of data model datatypes.