chapter 1: implemented corrections and comments by amy and florian