many fixups