added turning corrections
fixed conflicts