[WIP] Call more events & Events cleanup

A large amount of events are currently not called.

See #28.
It's best to only cleanup files you are touching.