Fixing overenthusiastic XML escaping, and some indents