Cleaned up rate limiting material a bit (ticket #119)