match setup tweaks