Fixed the demos (double-wrap bug, no escaping bug)