rounding up some todos