class renaming, and bug fixes.