Fixed Bug About Future Matches

Also made some minor changes to fix several bugs.