minor cleanups, and prove the HERE cheat