More chapters; more exercises