Fixes matchmaking bug
Cleaning up parameters
Added a lot of comments