Collective comments to be addressed from pnp review

@brandon.piotrzkowski I have created this as a placeholder for SSM circular changes requested during pnp processs.