Fix bug on XML spaces and some comments