Address PR comments
- update a few XML comments