xml format change + fixes