Fixed some method names, updated ToDo.