bugs added todo