Updated outdated dependencies
Some minor changes