Right now, there are two layers of comments when reviewing a word/docx file. If comments are added in the preview, they are not visible when the file is opened in editing/review mode. Furthermore, if comments are marked as resolved in the online editor, the "resolved" status is not persistent if the file is downloaded, edited offline, and uploaded again as a new version.