update comments
#36: update newToken()
update comments