Fixed issues to do with currOri orientation detection. Based this off the data rather than the elements.