finish some trival bugs