shuffle token parameters around, fix Api syntax