cleaning; some new todo.