massive calendar updates and tweaks