complete restore
complete resort and fix lang