Added lots of packages, half a new chapter, etc