layout remaining sidebars in chapter 6
update TODO.md