even more fixes esp. auth_tok

Change-Id: I540cd04151392bdddb691a162ca4496dc14aef9e
more more mods 5am friday

Change-Id: Iac02eb0173f6870caaff5021f6ecdb30395fbb41