Fixed a tiny filename bug, and improved an FS