- More tracing methods
- Small fixes in the transformation