More refactoring

Added a virtual tool carosel so that Tn behaviour more closely follows
the NIST standard wthout breaking anything.