Added more data, refined some demo stuff