smal changes in TODO