Some event fixes
Cleaned up some event handler potential leaks
Merge branch 'test' of github.com:kellyelton/OCTGN into test