change to salted password, vairous clean up