Made the backoff timer better / fixed a couple of issues