mopping up the events issues so I can move on to other stuff