Fixing typos with the specs and tidying up the controllers.