fixed checkin_controller. work in progress