comment grammar
Ignore repeated datasources
Regularised DM errors as per #99
Merged from dev