Vast improvements on line parsing