Fixed up controllers.js, to a certain degree.