fix some name issue and add comment for each of the class