Final fixies in Chapter 1, 2 and 3