Final changes

Final edits