WIP
Lots of minor formatting changes