Fixed rematch, added switch, improved names