Clean Up
Updates for WiFi and others