Fixed stuff and added View Matches