Collected changes and bug fixes since the start of the new regime

This pull request seems to be accumulating commits made even after the pull request was created.  Is this abut, or desired behaviour?