controllers bug fixes