-minor tweaks