fix controllers and add services