Add token check, fix some undisplayed text.