cleaned controllers, added relationships