Fix typos and more highlighting