recommended changes
Finally counts tokens properly

thanks splinterz!