Moved a few comments back into position