improve number extraction