Various minor improvements
minor #742 Various Minor Improvements (GrahamCampbell)

This PR was merged into the 1.2-dev branch.

Discussion
----------

Various Minor Improvements

Commits
-------

7b7021e Various minor improvements