minor fixes and added tracing