ironed out base controller bugs