Improvements (i hope) to the filesystem