Cleaning up 3DAngle matching algo, and adding some improvement to TimeOverlap matching algo