fixed bug when setting integrator and no model, added more user proofing
Merge branch 'develop' into rate