Various minor comment and semantics updates
Updates to Comments