more formatting changes, still in need of lots of edits