enhance report script
merge opt and update the script