fix bug where change instance before add instance would lead to keyerror; juggle the instance fields around
fix bug where change instance before add instance would lead to keyerror; juggle the instance fields around

jermowery/xos,xmaruto/mcord,xmaruto/mcord,cboling/xos,cboling/xos,cboling/xos,jermowery/xos,xmaruto/mcord,cboling/xos,xmaruto/mcord,jermowery/xos,cboling/xos,jermowery/xos