cleaned up chapters 2-3-4-5