- xml updates, refactor