HV-725 XML configuration and integration updates
HV-725 Fixing some typos and formatting issues