Change description to reflect implementation changes, small xml fixes.