master
various cleanups