Added comments and errors