More tokenization - particularly integers and floats