some bugs added in TODO-NEW file