Updates to PR comments, didn't get all comments, will require quick update after further discussion