More corrections and editing