Improved output, added basic support for adding events to the calendar