Fixed update functionality, reworked controllers