Bug fixes and enhancements. See CHANGELOG.md for deets