Clean up the controllers and fix true/false answer behaviour