rename eventhandler, register events on startup
Reformat