added numbering to highlighter
some adjustments