fixed some minor regexp problems,

The floating point scalars weren't processing correctly