fixed some token issues