added stand-alone demand builder utility
fix bug in dataset_store, move build_demand to utilities and document it better