corrected a bunch of event-single rendering things
Merge branch 'calendar' into dev