few touchups after last merge.