Issue 658 ratelimit settings

Basically address this issue #658