Minor improvements to report