Updated some chapters