support generators; make rpc work better