some more updates in the TODO list