Final misc edits