updated to latest Xtend with bug fixes