add demo data and minor fixes