Add a bunch more support for a bunch more events. Little code cleanup.  Little bug fixes.