More small changes to Game
Fixed has_available_merges