improve readability of chapter 2 and 3, change some links