merge some cpas changes in for the PXML.[ch] fields