Fixed odometry to work with turning
merge fixes