General rate limit

All other concerns have been addressed. Please, let me know if this is blocking the PR.