Minor changes and @todos.