Tweaks to label updates.  Fixed addressing for demo.json