Retry current song when hitting rate limit
Minor bug fixes