Fixed up app controller, etc.