Fix
Misc fixes
Password security improvements