Line fixes and more...