tweaking getToken() and parseToken()
tweaking getToken() and parseToken()