Code, doc tweaks