Minor cosmetic changes in flow & add demo