Added Create Event functionality and minor improvements