Added some more needed logic and constants to the Buffer and Token
implementations.

References #2
Fixes #3