Adjustment to some chapters and appendixes