fixes, improvements, version bumps