Cleaned up chapters 30-39