FINAL CALENDAR TWEAKS