Add index terms to Chapter 20
Fix a bug in Chapter 15's code