Random fixes + password security. Fixes #2