Charles misc changes

@charles-marion These are the changes that you pushed directly onto master. I force-pushed current master and put this in as a PR for discussion.