Fixed a bug in the FS, need to clean up logging