a lot of todo.py improvement