Fixed up some models and controllers