A few little mods while reviewing last classes work.