added missing x-refs, fixed typos