minor cleanups
merge