formatting adjustments and some doc changes