Fixed comments, renamed variables for consistency, implemented EventDispatcherInterface.