Better CSV parse, fix issues