Update calendar
Code tweaks