rename file and few corrections