remove space; add String() for token
fix decimal number processing; more rigid test