Better token presentation, some S/R conflicts solved