cosmetics and TODO++
Fix the line number in error location messages