Updated chapters and bibliography