fix bad nesting
elide _.enter into _.click
clean up a bit
better declaration/handler lookup
clean up
more declare tests
fresh build