Fixed PHPDoc here and there
Added more determinism to the FileSystem