Th pr batch 1

Small batch of Tradheli misc. changes.