More corrections (some reverts and typos)