some more work on matching and presets