fixed include paths and some inor issues in demo code