fixing token / key confusion