Fixup some comments so they make more sense
Add an event mask to allow us to specify which events we want to log