Arc turn logic hopefully fixed. Various cleanup