fixed uri duplication bug in dalliance -  plus some comments tidy up