few fixes, one important one with rates!