finish some todos