fix some TODO task