Further improvements to the Capacitor controls