Fixed bug, added todo.