fix some TODO