fixed highlight trailing whitespace
lots of modifications