diff --git a/src/Span.h b/src/Span.h
index 4bb7fb8..f51a303 100644
--- a/src/Span.h
+++ b/src/Span.h
@@ -425,7 +425,7 @@ namespace Characteristic {
   CREATE_CHAR(uint8_t,Active,0,0,1,INACTIVE,ACTIVE);  // indicates if the Service is active/on
   CREATE_CHAR(uint32_t,ActiveIdentifier,0,0,255);     // numerical Identifier of the <b>InputSource</b> selected in the Home App.
   CREATE_CHAR(uint8_t,AirQuality,0,0,5,UNKNOWN,EXCELLENT,GOOD,FAIR,INFERIOR,POOR);   // a subjective description
-  CREATE_CHAR(uint8_t,BatteryLevel,0,0,100);  // measured as a percentage
+  CREATE_CHAR(uint8_t,BatteryLevel,100,0,100);  // measured as a percentage
   CREATE_CHAR(int,Brightness,0,0,100);  // measured as a percentage
   CREATE_CHAR(double,CarbonMonoxideLevel,0,0,100);  // measured in parts per million (ppm)
   CREATE_CHAR(double,CarbonMonoxidePeakLevel,0,0,100);  // measured in parts per million (ppm)
diff --git a/tools/makeServiceList b/tools/makeServiceList
index ae1f4f6..647a55c 100755
--- a/tools/makeServiceList
+++ b/tools/makeServiceList
@@ -34,10 +34,13 @@ BEGIN {
 		default[char]=x[4]
 		min[char]=x[5]
 		max[char]=x[6]
-		nConstants[char]=n-6					# parse any pre-defined constants
-		value=0												# default starting value of constants
+		nConstants[char]=n-6								# parse any pre-defined constants
+		value=0															# default starting value of constants
 		for(i=0;i<nConstants[char];i++){
-			constantName[char,i]=x[i+7]
+			v=split(x[i+7],y,"=")							# split name of constant from (optional) value
+			constantName[char,i]=y[1]
+			if(v==2)													# override value if provided
+				value=y[2]
 			constantValue[char,i]=value
 			if(index(perms[char],"PR") && x[4]==value)
 				defaultMark[char,i]=":heavy_check_mark:"
diff --git a/tools/test.md b/tools/test.md
index 032677c..d65c524 100644
--- a/tools/test.md
+++ b/tools/test.md
@@ -1,7 +1,7 @@
 ## AccessoryInformation (3E)
 <details><summary> Required Identification Information.  For each Accessory in a HomeSpan device this <i>must</i> be included as the first Service.</summary><br><table>
 <tr><th>Characteristic</th><th>Format</th><th>Perms</th><th>Min</th><th>Max</th><th>Constants/Defaults</th></tr>
-<tr><td><b>Identify (14) :small_blue_diamond:</b><ul><li> triggers an update when HomeKit wants HomeSpan to run its identification routine for an Accessory</li></ul></td><td align="center">bool</td><td align="center">PW</td><td align="center">1</td><td align="center">1</td><td><ul><li><b>RUN_ID=1&nbsp(0)&nbsp;</b></li></ul></td></tr>
+<tr><td><b>Identify (14) :small_blue_diamond:</b><ul><li> triggers an update when HomeKit wants HomeSpan to run its identification routine for an Accessory</li></ul></td><td align="center">bool</td><td align="center">PW</td><td align="center">1</td><td align="center">1</td><td><ul><li><b>RUN_ID&nbsp(1)&nbsp;</b></li></ul></td></tr>
 <tr><td><b>FirmwareRevision (52) </b><ul><li> must be in form x[.y[.z]] - informational only</li></ul></td><td align="center">string</td><td align="center">PR+EV</td><td align="center">-</td><td align="center">-</td><td align="center">"1.0.0"</td></tr>
 <tr><td><b>Manufacturer (20) </b><ul><li> any string - informational only</li></ul></td><td align="center">string</td><td align="center">PR</td><td align="center">-</td><td align="center">-</td><td align="center">"HomeSpan"</td></tr>
 <tr><td><b>Model (21) </b><ul><li> any string - informational only</li></ul></td><td align="center">string</td><td align="center">PR</td><td align="center">-</td><td align="center">-</td><td align="center">"HomeSpan-ESP32"</td></tr>
@@ -42,7 +42,7 @@
 ## BatteryService (96)
 <details><summary> Defines a standalone Battery Service.</summary><br><table>
 <tr><th>Characteristic</th><th>Format</th><th>Perms</th><th>Min</th><th>Max</th><th>Constants/Defaults</th></tr>
-<tr><td><b>BatteryLevel (68) :small_blue_diamond:</b><ul><li> measured as a percentage</li></ul></td><td align="center">uint8</td><td align="center">PR+EV</td><td align="center">0</td><td align="center">100</td><td align="center">0</td></tr>
+<tr><td><b>BatteryLevel (68) :small_blue_diamond:</b><ul><li> measured as a percentage</li></ul></td><td align="center">uint8</td><td align="center">PR+EV</td><td align="center">0</td><td align="center">100</td><td align="center">100</td></tr>
 <tr><td><b>ChargingState (8F) :small_blue_diamond:</b><ul><li> indicates state of battery charging</li></ul></td><td align="center">uint8</td><td align="center">PR+EV</td><td align="center">0</td><td align="center">2</td><td><ul><li><b>NOT_CHARGING&nbsp(0)&nbsp;</b>:heavy_check_mark:</li><li><b>CHARGING&nbsp(1)&nbsp;</b></li><li><b>NOT_CHARGEABLE&nbsp(2)&nbsp;</b></li></ul></td></tr>
 <tr><td><b>StatusLowBattery (79) :small_blue_diamond:</b><ul><li> indicates state of battery</li></ul></td><td align="center">uint8</td><td align="center">PR+EV</td><td align="center">0</td><td align="center">1</td><td><ul><li><b>NOT_LOW_BATTERY&nbsp(0)&nbsp;</b>:heavy_check_mark:</li><li><b>LOW_BATTERY&nbsp(1)&nbsp;</b></li></ul></td></tr>
 <tr><td><b>Name (23) </b><ul><li> default name of a Service used <i>only</i> during initial pairing</li></ul></td><td align="center">string</td><td align="center">PR</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
@@ -128,7 +128,7 @@
 <tr><td><b>FilterChangeIndication (AC) :small_blue_diamond:</b><ul><li> indicates state of filter</li></ul></td><td align="center">uint8</td><td align="center">PR+EV</td><td align="center">0</td><td align="center">1</td><td><ul><li><b>NO_CHANGE_NEEDED&nbsp(0)&nbsp;</b>:heavy_check_mark:</li><li><b>CHANGE_NEEDED&nbsp(1)&nbsp;</b></li></ul></td></tr>
 <tr><td><b>Name (23) </b><ul><li> default name of a Service used <i>only</i> during initial pairing</li></ul></td><td align="center">string</td><td align="center">PR</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
 <tr><td><b>FilterLifeLevel (AB) </b><ul><li> measures as a percentage of remaining life</li></ul></td><td align="center">float</td><td align="center">PR+EV</td><td align="center">0</td><td align="center">100</td><td align="center">0</td></tr>
-<tr><td><b>ResetFilterIndication (AD) </b><ul><li> triggers and update when the user chooses to reset the <b>FilterChangeIndication</b> from the Home App</li></ul></td><td align="center">uint8</td><td align="center">PW</td><td align="center">1</td><td align="center">1</td><td><ul><li><b>RESET_FILTER=1&nbsp(0)&nbsp;</b></li></ul></td></tr>
+<tr><td><b>ResetFilterIndication (AD) </b><ul><li> triggers and update when the user chooses to reset the <b>FilterChangeIndication</b> from the Home App</li></ul></td><td align="center">uint8</td><td align="center">PW</td><td align="center">1</td><td align="center">1</td><td><ul><li><b>RESET_FILTER&nbsp(1)&nbsp;</b></li></ul></td></tr>
 </table></details>
 
 ## GarageDoorOpener (41)
@@ -338,7 +338,7 @@
 <tr><td><b>Active (B0) :small_blue_diamond:</b><ul><li> indicates if the Service is active/on</li></ul></td><td align="center">uint8</td><td align="center">PW+PR+EV</td><td align="center">0</td><td align="center">1</td><td><ul><li><b>INACTIVE&nbsp(0)&nbsp;</b>:heavy_check_mark:</li><li><b>ACTIVE&nbsp(1)&nbsp;</b></li></ul></td></tr>
 <tr><td><b>ConfiguredName (E3) </b><ul><li> a "configurable" Service name - any updates made from within the Home App trigger an update in HomeSpan and vice versa.</li></ul></td><td align="center">string</td><td align="center">PW+PR+EV</td><td align="center">-</td><td align="center">-</td><td align="center">"unnamed"</td></tr>
 <tr><td><b>ActiveIdentifier (E7) </b><ul><li> numerical Identifier of the <b>InputSource</b> selected in the Home App.</li></ul></td><td align="center">uint32</td><td align="center">PW+PR+EV</td><td align="center">0</td><td align="center">255</td><td align="center">0</td></tr>
-<tr><td><b>RemoteKey (E1) </b><ul><li> triggers an update when the corresponding key is pressed in the Remote Control widget on an iPhone </li></ul></td><td align="center">uint8</td><td align="center">PW</td><td align="center">4</td><td align="center">15</td><td><ul><li><b>UP=4&nbsp(0)&nbsp;</b></li><li><b>DOWN&nbsp(1)&nbsp;</b></li><li><b>LEFT&nbsp(2)&nbsp;</b></li><li><b>RIGHT&nbsp(3)&nbsp;</b></li><li><b>CENTER&nbsp(4)&nbsp;</b></li><li><b>BACK&nbsp(5)&nbsp;</b></li><li><b>PLAY_PAUSE=11&nbsp(6)&nbsp;</b></li><li><b>INFO=15&nbsp(7)&nbsp;</b></li></ul></td></tr>
+<tr><td><b>RemoteKey (E1) </b><ul><li> triggers an update when the corresponding key is pressed in the Remote Control widget on an iPhone </li></ul></td><td align="center">uint8</td><td align="center">PW</td><td align="center">4</td><td align="center">15</td><td><ul><li><b>UP&nbsp(4)&nbsp;</b></li><li><b>DOWN&nbsp(5)&nbsp;</b></li><li><b>LEFT&nbsp(6)&nbsp;</b></li><li><b>RIGHT&nbsp(7)&nbsp;</b></li><li><b>CENTER&nbsp(8)&nbsp;</b></li><li><b>BACK&nbsp(9)&nbsp;</b></li><li><b>PLAY_PAUSE&nbsp(11)&nbsp;</b></li><li><b>INFO&nbsp(15)&nbsp;</b></li></ul></td></tr>
 <tr><td><b>PowerModeSelection (DF) </b><ul><li> when defined, creates a "View TV Settings" button in the Home App that triggers an update to this Characteristic when pressed </li></ul></td><td align="center">uint8</td><td align="center">PW</td><td align="center">0</td><td align="center">0</td><td><ul><li><b>VIEW_SETTINGS&nbsp(0)&nbsp;</b></li></ul></td></tr>
 </table></details>
 

Characteristic	Format	Perms	Min	Max	Constants/Defaults
Identify (14) :small_blue_diamond: triggers an update when HomeKit wants HomeSpan to run its identification routine for an Accessory	bool	PW	1	1	RUN_ID=1 (0)
Identify (14) :small_blue_diamond: triggers an update when HomeKit wants HomeSpan to run its identification routine for an Accessory	bool	PW	1	1	RUN_ID (1)
FirmwareRevision (52) must be in form x[.y[.z]] - informational only	string	PR+EV	-	-	"1.0.0"
Manufacturer (20) any string - informational only	string	PR	-	-	"HomeSpan"
Model (21) any string - informational only	string	PR	-	-	"HomeSpan-ESP32"
Characteristic	Format	Perms	Min	Max	Constants/Defaults
BatteryLevel (68) :small_blue_diamond: measured as a percentage	uint8	PR+EV	0	100	0
BatteryLevel (68) :small_blue_diamond: measured as a percentage	uint8	PR+EV	0	100	100
ChargingState (8F) :small_blue_diamond: indicates state of battery charging	uint8	PR+EV	0	2	NOT_CHARGING (0) :heavy_check_mark: CHARGING (1) NOT_CHARGEABLE (2)
StatusLowBattery (79) :small_blue_diamond: indicates state of battery	uint8	PR+EV	0	1	NOT_LOW_BATTERY (0) :heavy_check_mark: LOW_BATTERY (1)
Name (23) default name of a Service used only during initial pairing	string	PR	-	-	"unnamed"
FilterChangeIndication (AC) :small_blue_diamond: indicates state of filter	uint8	PR+EV	0	1	NO_CHANGE_NEEDED (0) :heavy_check_mark: CHANGE_NEEDED (1)
Name (23) default name of a Service used only during initial pairing	string	PR	-	-	"unnamed"
FilterLifeLevel (AB) measures as a percentage of remaining life	float	PR+EV	0	100	0
ResetFilterIndication (AD) triggers and update when the user chooses to reset the FilterChangeIndication from the Home App	uint8	PW	1	1	RESET_FILTER=1 (0)
ResetFilterIndication (AD) triggers and update when the user chooses to reset the FilterChangeIndication from the Home App	uint8	PW	1	1	RESET_FILTER (1)