improved water functions. Added colored droplets.