fixed lots of bugs in the TODO list