Light Masking Tweaking and fixes