California tinkers with residential energy tariffs