rxml development, common.h development, refactoring