this is coming along really fast - great job mate. i think you're going about the lights in the right way - you might want to play with the incandescence as well.

the water looks really good - well done!