bugs fixed, all to ROI