Controllers

Fixed the majority of the bugs plaguing controllers. Put isnt quite working though.