Edited deprecated stuff
Added some more line number tests
merge conflict resolved
figured out a small inline commenting bug