Bug fixes to issue #2. Passwords are now obscurated