fixes for light control