edits, fixes