Added line numbers, fixed bug