minor fixes + generate token complete version