fix a few variable names and add the token -> col map to the cache