fabio updates to ch7, and beginning to address editor comments for ch3