Merged Line methods

Also renamed some of em.