It seems to be working better now? Needs further testing. I need handle the case of multiple tokens for commands.