Clean up some controllers and make SQL not die so much on update