fixed some last bugs, changed an XML tag