Orgasmic commit: fixed most bugs, waiting room stub, crazy end of match