Fixed & updated match start a bit