bug fixes and remove calendar events