tweaks
fixed token issue