Use SHA1 with salt for passwords, minor fixes