Some fixes/typos after comments from emax

- Add unique types info after Match code