Additions from John Jarvis
Formatting changes and tweaks