Upgrade

This PR brings some things up to date.  It also addresses various test failures and also hides some of the ugliness of the console.log output.