Updates, minor tweaks