Further improvements to full report