Bugfixes, added line() method