fixed some token stuff