fix some diagnostics
improve behaviour when access-token is expired
remove some diagnostics