More additions/refinements to the rate code.