Regarding water effects, if you hadn’t already followed it John recently did a great job in this thread (scroll towards the end)…
As he found it’s challenging, but some of his discoveries might save you some pain.