Improved data parsing and formating.