Updates for build infrastrucure and minor textual edits
7 files changed