Fix ExpandAll bug; update demo future content
Additional Future demo content tweaks