Various changes

A lot of revisions done, utilizing the single event instance