tk: update maintainer; misc cleanups.