final minor tweaks