fixed controller bugs everything merged now and working