Bug fixes and client enhancements

See CHANGES.md