2HashTableWithFunction + missing files + and other small comments Yuri