+ minor tweaks