chapt7 fixes