supporting multiple number detection
Fixing bugs and providing better support for unit-dependent features