Numeric tweaks

Tweaks to numeric rules to be more verbose and comprehensive