some manual edits