Various fixes and tweaks
Fixed silliness with access token verification