make minor model changes and database fixes