various cleanups
another