Fixed some errors, controllers, and concerns