controllers and models fixed