More fixes to wadl

author: diane fleming
Merge pull request #3 from dian4554/fix-wadl3

More fixes to wadl