Major bug fixed. Not yet convinced that T3 is exactly working right, though.