Eliminate event sprawl
Comment fixes