Two new chapters, some minor changes to 03