more work on services, controllers
cleanup