several click-hit issues fixed