ELF-20 finishing touches