Fixing minor bugs, eliminating warnings and rationalizing class names