switch4g: improvements