fix markup
fix rate limiting when exceptions are thrown