more fixes to todo