Only use selectable markers in on touch. Cleanup.
Make the calibration and origin painters working again.