deal with some todos in Chapter 3