fix + chapter6 done