Lighting improvements

Waiting for Slantsixdan's professional opinion.