fix password reset and verification & a few minor updates