ogg/nfo/o fixes, among other minor stuff