small fixes, rematch