various cleanups and docs improvements