small changes in controllers and models