nicer tracing interface and bugfixing...
merged