Fixes
fix switching service xml example
Worked in John's improvements