Typos in class name and some small comment edit