Further corrections (mostly to my changes)