Fixed issues in Chapter 1