add "stkotok" to some todo's