A few cleanups, and a few additions to FileHashes