various manual edits