Huge update to match the latest versions of our work.