make svscloak do ts6 properly and generally clean it up a bit