update Match-scr, language, fix bug