Add token to env vars
minor fixes