Updated dependencies, and made changes accordingly.