Xcomms

correcting more issues