cmap, plus a few doc tweaks