Setup dynamic rate control properly

Next to work on the rate stability