Fixed odt generation (incomplete)