minor tweaks & updates