More water improvements

Normal mapping