Tweaked commenting and layout
Added highlighting of whole current line