step?() clarifications
Cleaned up controller
Tightened up ModelWizard code