repare some lost modif and do some minor correction