Minor tweaks
merging