fixed more controller bugs