dl is now linked
Fixed r_water default value conflict ion
Some bug fixes & performance tuning