various cleanups
merge