fix some todo