fix some todoxs