building dist
minor cleanups
merge