tweaks for click handling