US632 - include type of circs change to xml
US632 - fix various issues