just doing some code cleanup

and trying to add events, but failing thus far…