Fixed some comments to be more applicable