Add improvements to fix lighting engine.