Fixes from rebasing holman/master back into this master. Thanks for the fun git refresh holman, loved the massive overhauls!