Fixes to token and resave
Add check before upd stats