updated todo-list, cleaned source