Debug lines changed a bit to be consistent across the board.

Removed todo.