Add Avast + minor improvements