Further tweaks to the parse line