Made CurrentPath return in the right order and fixed issue with End Tokens being popped too early