Listener Changes

A variety of small changes to the click checker. Working with John on
one line that’s failing to compile.