more minor fixes and cleaning
remove some sections, trim others, and move others around