ShadowMasks updates

I holding updates of other cores with shadow masks as there are some possible updates in the ShadowMasks code.  Don't worry, it should be settled down soon.