Finish Ch6 and tweaks everywhere (Chapter 6)