add the bzr cha and fix some issues