Fixed demo.xml and numeration issues