minor tweaks throughout