added xWrap, x_ methods, tests