More updates

author: diane fleming
Merge pull request #2 from dian4554/fix-wadl

More updates