Added support for multiple lights
Some cleanup