tidy up
fixed a bug of setting rate without bps shift
tidy up