Some fixes
Event handler organizing
bla