change tokenizing boolean token, fix minor bug in number token