tt
some fixes