Finish some minor stuff