Cosmetic changes
Substantial improvement: better filtering