Update Bump Version and fix bugs