Various Fixes
Version Bump
Version Bump