Many changes, XML now working