bugfix: populator hotfix
add some comments