Finish some improvements