Minor lighting effects and refactoring.