fix infix parse; workaround multi-match referencing; started playing with highlighting