Finalized Comments
Merge branch 'UpdateComments'