more line number bug fixes