code fixes and version bumps