hittest improvements