fixing a few issues with tokens.l