Fixed some turning bugs, working more consistently