A few edits on the controller