Requirements updates

Merged Michael's changes to main requirements documents. Changed wording
in some requirements.