Bunch of updates around fixing syntax highlighting