minor spelling/grammar corrections
Merge pull request #3048 from lucidlogic/master

minor grammar corrections
Check type of token as well.