appointments tweaks, and class name changes