Version Bump + other fixes