General Updates

See CHANGELOG.md