last few minor tweaks