Final Changes Pre-Submission

This is up to last Thursday, before the internet connection went pear
shaped