add notification for calendar events && code cleanups