Some fixes on light.

But still problematic.