Fixed [0trace]

Ignore the 60+ commits, had to fix my tree.