fix whitespace and long line highlighting