Just the one commit for now

Various additions and general formatting tweaks