Improved saving report values, and a few improvments