cli & doc tweaks