Fixed endings and added todo.