Implemented fixes related to our first pass document.