fix comments & Viewer