mostly format changes
plans for next steps
scripted update of code from master at 32fd691 plans for next steps