Small changes and XML output