more cleanups
add tracing options