Cleaning some comments, removing debug lines, one fencepost fix