clean up plots and chunk names in chp 6
adding swap simulations in chp 7