Bug fixes on pull request
Some changes to how the rate limiter works