fix some todox