Fixed some stuff with Controller