Some changes which I liked, nothing special
Implemented tokensToNumber more correctly
Implemented tokensToNumber more correctly and merged