todo and who-to-do-it
minor bugfix