fixed bug when setting integrator and no model, added more user proofing