minor adjustments
merge