updates to ch5, addressing fabio comments