lots of reformatting
merge fixes
small format changes and merges