close #1

reworked highlight
correction parsing