Minor XML formatting and +multiline