diss: various improvements in chapter 2 and 3