Bug squash: only set clickstate == True if mouse button is down
Import cleanup & small test fix