I'm no experts, but seeing as no one else is answering , I'll give it a shot.
For your glass and water you might want to plug in the refract node instead of using transparency.
Set all your transparency setting to zero if you do, these interfere with the refract node.
If you use the refract node, set your diffuse color and specular color to black.
These also interfere with the refract and reflect nodes. You will want to put a different index
of refraction for the glass and for the water so they don't blend together.
And the sum of the reflection value and refraction value should equal one.
Say if you have 10% reflection (0.1) you should have 90% refraction (0.9).
To see the lights shining on the glass and water, add a glossy node to
your alternate specular input and set Ks to a low value. say 0.2 or .03.
As you are already using the reflect node, I'm assuming you have ray tracing
enabled in your render settings.

What don't you like about the lights?