xforms and bug fixes