Fixed up the final parsing of data hopefully