Fixed a bug in the event listener base class
Simplified EventListener. Noticed a bit of a slow down - might be my machine running too much of a load.