Added some comments to token.rs and changed some names.