Fixed some more issues with the controller

Also removed some debug puts that are no longer necessary