Fixed funny turning (still badly patched)