Improving Water Surface Current Estimation From Radar Data