finish some bugs