Final edits... hopefully