Adding ability to save demand set and other tweaks.