More minor changes to ch1 - ch3