finish some more stuff