more ch05 updates... still in progress