Cleanup and comment usermodel
Cleanup db, add more test users to get some matches
Fix edit profile population, correct labelling of configuration