controller bug fixes