Hopefully make the wps debug info more understandable... display tokens the same...