fixes, edits