reworkify rateStubs (fix #24)