added fixed and cleaned match script
merge