minor tweaks
merge