big improvements to correspondence package