move some things around
handle better the case when we get banned. Still it doesn't rejoin