added TSS 7 and 8, plus other fixes