Added comments and filesystem