Cleaned up some eventHandler stuff
Added support for lambdas, and function pointers