Multiple edits (per the interim)

There are quite a few edits in here... merges from the other outstanding pull requests included... It was easier just to merge these and work on them iteratively given the extensive changes...