Finish updating models and fixing what broke.