AFAIK they're improving hand-editing of masks currently. What you can do now that works quite well is start off with a basic Dynamask (which is excellent) and apply the mask, then edit the mask itself in photoshop, using say the albedo channel. Then, after hand editing the map (For scratches I'd use dynamask to get a nice…