Improved indenting & some more highlighting
Missed a couple of obvious keywords