Add improvements to ChocolateyTools