Reverted to old file system, fixed bugs etc