Cleaned up some stuff. Tokens are now tupels (sp?).