update token handling
update guest handling add drtv