Event Handler cleanup
Whoops, move event handler registration to init from preInit. Fixes #148
Autocleanup