Another round of fixing/cleanup

I think this is the last of the simple event stuff.