Minor formatting
Merge fixed
XML updates