updated model assocations and added controller comments