Adds line continuation processing, better parsing