Fix regexs

I forgot decimals existed, and `?` isn't an operator by itself. Had to
shuffle positions around.