fixed user model and login now works
cleanup
more cleanup