Fix: correct order of tokens
Minor: isCompleteToken improved