Fianl report improvements