Updated some comments to reflect fixes