Calendar updates

see commit history for changes.