Fixed non-start issues and fixed syntax highlighting.

The old adage of never release on a Friday comes to mind :)