List Match

Small updates
Cleanup