fix idents and xml updating