Fixed the matching game and more.