Corrects some classname misnames adds req'd attrs
Actually, do not let this recurse indefinitely.
whitespace cleanup
cleanup of a (for now) superfluous method