Updated chapter 5 and bibliography