Undid the changes I did to the database

Change back the database to what Matt did.
Little changes to userprofile stuff