Many small corrections, found when working on an actual extension