Fix continue bug, add partial touch support