Welcome back Travis

About the water on the floor thing. You could approach it like this:

Model the floor so it had dips and uneven spots then set the water geometry below but intersecting to a point that gives you the desired water level. I like using a poly cube since it allows me to tweak the shader to create depth and even a volume shader if I wanted.