done many many corrections