Bug fixes and a change to the users.yml format.