switch to tokens.
Minor fixes.