fix chpt6 stuff and exercises