Updated dependencies

But not yet complete!