edits, updates, fixes