more fixes for light