Fixed up tpak_cls.h somewhat