fix logout; + token fixes