removed a couple todos, fixed variable name