few minor tweaks