updates for more recent versions of libs, working to get all tests passing