Minor fixes.
Part 2 of rate limiting.
Link to second part of rate limiting fom first.