tweaks
Make Mask take no message.
Add a Wrapf