diff --git a/boom/lib/e12.inc b/boom/lib/e12.inc
index 08741e1..8094d15 100644
--- a/boom/lib/e12.inc
+++ b/boom/lib/e12.inc
@@ -8,7 +8,8 @@ _E12_1=(??)4	-> _E12=${_E12_1:1}0k
 _E12_1=(?)(?)5	-> _E12=$_E12_1:1.${_E12_1:2}M
 _E12_1=(??)6	-> _E12=${_E12_1:1}M
 _E12_1=(??)7	-> _E12=${_E12_1:1}0M
-_E12_1=R(??)	-> _E12=0.$_E12_1:1
+_E12_1=R(??)	-> _E12=${_E12_1:1}0m
+_E12_1=R00	-> _E12=0		# override previous
 _E12_1=(?)R(?)	-> _E12=$_E12_1:1.$_E12_1:2
 
 # E96 scale
@@ -19,7 +20,7 @@ _E12_1=(??)(?)2	-> _E12=$_E12_1:1.${_E12_1:2}k
 _E12_1=(???)3	-> _E12=${_E12_1:1}k
 _E12_1=(?)(??)4	-> _E12=$_E12_1:1.${_E12_1:2}M
 _E12_1=(??)(?)5	-> _E12=$_E12_1:1.${_E12_1:2}M
-_E12_1=R(???)	-> _E12=0.$_E12_1:1
+_E12_1=R(???)	-> _E12=${_E12_1:1}m
 _E12_1=(?)R(??)	-> _E12=$_E12_1:1.$_E12_1:2
 _E12_1=(??)R(?)	-> _E12=$_E12_1:1.$_E12_1:2
 
@@ -35,8 +36,9 @@ _E12_P=(??)4	-> _E12=${_E12_P:1}0n
 _E12_P=(?)(?)5	-> _E12=$_E12_P:1.${_E12_P:2}u
 _E12_P=(??)6	-> _E12=${_E12_P:1}u
 _E12_P=(??)7	-> _E12=${_E12_P:1}0u
-_E12_P=R(??)	-> _E12=0.${_E12_P:1}p
-_E12_P=(?)R(?)	-> _E12=$_E12_P:1.${_E12_P:2}p
+_E12_P=R(??)	-> _E12=${_E12_P:1}0f
+_E12_P=0R(?)	-> _E12=${_E12_P:1}00f
+_E12_P=([1-9])R(?) -> _E12=$_E12_P:1.${_E12_P:2}p
 
 # remove leading and trailing zeroes
 
diff --git a/boom/manu/Makefile.common b/boom/manu/Makefile.common
index 9097653..5ddd2fc 100644
--- a/boom/manu/Makefile.common
+++ b/boom/manu/Makefile.common
@@ -4,7 +4,7 @@ UC_NAME = $(shell echo $(NAME) | tr [a-z] [A-Z])
 
 EQU = $(shell ../../boom-config equ)
 
-.PHONY:		all test sane
+.PHONY:		all test spotless sane
 
 all:		$(NAME).chr
 
@@ -17,12 +17,15 @@ test:
 LIMIT =		sed '1{x;s/.*/--- $(1) ---/p;x;};6{s/.*/.../;q;}'
 
 MALFORMED =	@grep '\<T=$(2)\>' $(NAME).chr | \
-		  grep -v '\<$(3)=[0-9][0-9.]*[fnpumkMG]\?$(4)\>' | \
+		  grep -v '\<$(3)=\(0R\|[1-9][0-9.]*[fnpumkMG]\?$(4)\)\>' | \
 		  $(call LIMIT,$(1))
 
 ABSENT	=	@grep '\<T=$(2)\>' $(NAME).chr | grep -v '\<$(3)=' | \
 		  $(call LIMIT,$(1))
 
+spotless:
+		rm -f $(NAME).chr
+
 sane:
 		@# general
 
diff --git a/boom/manu/stackpole/stackpole.gen b/boom/manu/stackpole/stackpole.gen
index 2ebe131..4769d3a 100644
--- a/boom/manu/stackpole/stackpole.gen
+++ b/boom/manu/stackpole/stackpole.gen
@@ -39,6 +39,7 @@ RNCP* -> T=R {
 
 # Adjust multipliers
 
+_R=R(???)	->	_R=${_R:1}m
 _R=(*)R(*)	->	_R=0$_R:1.$_R:2
 _R=(*)K(*)	->	_R=$_R:1.${_R:2}k
 _R=(*)M(*)	->	_R=$_R:1.${_R:2}M