command-t is now (almost) usable