add some fixes and changed match view