xml changes and cleanups