Improved TARDIS support

Also added thumper support.