fixes. added todo