Added DemandSetFactory; added modstamp to DemandSet; updated comments