Adjusted error codes, see related issue
Added token.Token and token.GetToken
Fixed merge shit