Fixed further issues with systembuilder.  May be running into gaff2xml limitations now.