Add extra whitespace highlighting
Misc updates