Change feedback message and fix rate limiting