Fixes to class names for import and minor notes fixes.
Whitespace and minor typo fix.