version bump and some fixes