Fix set_model_params() -- last commit broke it partially
Minor cleanup