Various improvements in report script