updates to ch7, addressing fabio comments