Some finalish edits