[pl] chapter 7 improvements