Update calendar, fix date comparison