Updated some comments to reflect the new reality