finish some todo