use env for tokens, get rid of message check, move that to config

use env for tokens, get rid of message check, move that to config #8