Minor augmentations to capabilities and doc