Updated Event class and streamlined generation of events. Multiple minor changes.