changed some inlines in Controller.h/cpp