Fix token + string passing bug
Fix documentation