minor tweaks for submission
merge