Working client hardware/software filter
Visual tweaks
Improved matching
Improved matching