this and that
Phew. Actually all sorts of changes. This commit marks the end of Chapter 5.