More batteries and setting fixes