fixes in ch6