changed todo-list and reordered python code