Fixed demo.xml and numeration errors