small changes, event handler still outstanding

Still testing event handler with callbacks.  Will check in once tests
pass for it.