fixed a todo, commented out the rest