Enhancements to the Design and Analysis of Waterjet Propulsors using a Coupled Lifting-Surface/RANS Technique Including Comparisons with Experiment