minor change, because this class name makes more sense
A little housekeeping and minor bug fixes.