minor manual post organization edits
merge