fixed lingering stuff from last merge in ch 4