Water is much better and it looks like you also corrected the 'tiling' in the wall texture.

One thing I did notice is a thin, dark colored line just below the wall at the bottom of the map. Maybe a coontour line you decided not to use or something. Not big deal really, just wanted to point it out.