improved some class description, fixed some typo