more changes to models, admin survey, views, database