adding token_hash to Request, fixing token vs. token_hash paradigm/transtyping