update ts6 from charybdis
misc