Made lighting more flexible to prepare for specular