finishing some stuff for ch 8, fix up testing