fix issue, add some logging, adapt metadata