some typos fixed, class names codified