small fixes + added todo.