Fixed some issues and added turn to