Updated deps and minor tweaks