overall update - improved main touch script conditionals