Multiple fixes

Here and above, you've kept the events commented out. Did you mean to submit this with that commented out?