Comment out a stray echo
Fix line number calculation with \d