better handling of calendar events