Improved data sampling and various details.