- return value bugfix, tested to work properly
- code cleanup
- first Trace implementation.