added some tokens, fixed json output