ODF cleanups

Tests are passing. Also ran some manual tests since ODF tests are scarce.