Moved some comments around, not much