+ base event type controller refactor
+ comment updates