Added fiducial canvas and better state tracking