Minor fixes; added line number reporting