added methods to tokens
improved tokens