Edits up to Rate Limiting

Rate Limiting is not in this
Merged