Adding ducttape-demo and some other fixes