moving some comments around