minor tweaks
merging