Update report and minor modifications