add more info in output
Merge branch 'master' into wip/iter-ng