refs #615, #617, #622 - Small changes

See #615, #617, and #622.

There may be a handful of merge conflicts with the other active development branch; I'd be happy to merge this in after that one is in the develop branch.