Some modifications, categories for book edition not done yet