hittesting fixes