fixing bugs WIP RFR