Added more users.
Provided some better error handling for bad directories.