Updated dependencies
Minor tweaks