Fixed some stuff, added special to data.xml