Adding some packages, cleaning up broken cygwin stuff.