Improved generation of rate plots
Ditto