misc blah... moved xml lines around