Update dependencies, minor tweaks format