small bits, less cruft in tenfwd
cleanup
more pubsub