Some bugfixes, extended ordinal info