Moved a few comments to better reflect state.