bunch more class/calendar changes