fixed toString method for tokens
moved code into new command
improved