XML docs in place. Some small cleanup