Better report and some other changes