Updates to point to lots of new third party libs and some small tweaks to take account of minor name changes