As far as the water's concerned, that funny rough 'oily' look is from the wind patch settings.
If you are after calmer water try reducing them or turning them off. That way you can get that glass look, or you could put in some small waves to have a wavy look.
Your terrain could do with a couple of more shaders, or perhaps just tweak the ones you have. A little more colour variation is what I would go for.
The terrain shape and pov look good. Will make a good render when complete.
Iain
