extend logging, fix func names..