elf: improvements