merging changes into xtitter